diff --git a/MAINTAINERS b/MAINTAINERS
index 89e3738..4a24a92 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -272,6 +272,7 @@
 R:	NXP i.MX U-Boot Team <uboot-imx@nxp.com>
 S:	Maintained
 T:	git https://source.denx.de/u-boot/custodians/u-boot-imx.git
+F:	arch/Kconfig.nxp
 F:	arch/arm/cpu/arm1136/mx*/
 F:	arch/arm/cpu/arm926ejs/mx*/
 F:	arch/arm/cpu/armv7/vf610/
diff --git a/board/coreboot/coreboot/MAINTAINERS b/board/coreboot/coreboot/MAINTAINERS
index ee12d32..f777365 100644
--- a/board/coreboot/coreboot/MAINTAINERS
+++ b/board/coreboot/coreboot/MAINTAINERS
@@ -1,13 +1,11 @@
 COREBOOT BOARD
 M:	Simon Glass <sjg@chromium.org>
 S:	Maintained
-F:	board/coreboot/coreboot/
+F:	board/coreboot/
 F:	include/configs/coreboot.h
 F:	configs/coreboot_defconfig
 
 COREBOOT64 BOARD
 M:	Simon Glass <sjg@chromium.org>
 S:	Maintained
-F:	board/coreboot/coreboot/
-F:	include/configs/coreboot.h
 F:	configs/coreboot64_defconfig
diff --git a/board/devboards/dbm-soc1/MAINTAINERS b/board/devboards/dbm-soc1/MAINTAINERS
index 625f2c8..577eba5 100644
--- a/board/devboards/dbm-soc1/MAINTAINERS
+++ b/board/devboards/dbm-soc1/MAINTAINERS
@@ -1,5 +1,6 @@
 Devboards.de DBM-SoC1 BOARD
 M:	Marek Vasut <marex@denx.de>
 S:	Maintained
+F:	board/devboards/dbm-soc1/
 F:	include/configs/socfpga_dbm_soc1.h
 F:	configs/socfpga_dbm_soc1_defconfig
diff --git a/board/efi/efi-x86_app/MAINTAINERS b/board/efi/efi-x86_app/MAINTAINERS
index b292811..584619c 100644
--- a/board/efi/efi-x86_app/MAINTAINERS
+++ b/board/efi/efi-x86_app/MAINTAINERS
@@ -1,6 +1,7 @@
 EFI-X86_APP32 BOARD
 M:	Simon Glass <sjg@chromium.org>
 S:	Maintained
+F:	board/efi/Kconfig
 F:	board/efi/efi-x86_app/
 F:	include/configs/efi-x86_app.h
 F:	configs/efi-x86_app32_defconfig
@@ -8,6 +9,7 @@
 EFI-X86_APP64 BOARD
 M:	Simon Glass <sjg@chromium.org>
 S:	Maintained
+F:	board/efi/Kconfig
 F:	board/efi/efi-x86_app/
 F:	include/configs/efi-x86_app.h
 F:	configs/efi-x86_app64_defconfig
diff --git a/board/efi/efi-x86_payload/MAINTAINERS b/board/efi/efi-x86_payload/MAINTAINERS
index abf3a15..d795d60 100644
--- a/board/efi/efi-x86_payload/MAINTAINERS
+++ b/board/efi/efi-x86_payload/MAINTAINERS
@@ -1,6 +1,7 @@
 EFI-X86_PAYLOAD BOARD
 M:	Bin Meng <bmeng.cn@gmail.com>
 S:	Maintained
+F:	board/efi/Kconfig
 F:	board/efi/efi-x86_payload/
 F:	include/configs/efi-x86_payload.h
 F:	configs/efi-x86_payload32_defconfig
diff --git a/board/firefly/firefly-rk3308/MAINTAINERS b/board/firefly/firefly-rk3308/MAINTAINERS
index 1990797..e584038 100644
--- a/board/firefly/firefly-rk3308/MAINTAINERS
+++ b/board/firefly/firefly-rk3308/MAINTAINERS
@@ -1,5 +1,6 @@
 ROC-RK3308-CC
 M:      Andy Yan <andy.yan@rock-chips.com>
 S:      Maintained
-F:      board/firefly/firefly-rk3308/roc_cc_rk3308.c
+F:      board/firefly/firefly-rk3308/
 F:      configs/roc-cc-rk3308_defconfig
+F:      include/configs/firefly_rk3308.h
diff --git a/board/freescale/ls1043ardb/MAINTAINERS b/board/freescale/ls1043ardb/MAINTAINERS
index 36e7331..8e14ba3 100644
--- a/board/freescale/ls1043ardb/MAINTAINERS
+++ b/board/freescale/ls1043ardb/MAINTAINERS
@@ -3,7 +3,6 @@
 M:	Rajesh Bhagat <rajesh.bhagat@nxp.com>
 S:	Maintained
 F:	board/freescale/ls1043ardb/
-F:	board/freescale/ls1043ardb/ls1043ardb.c
 F:	include/configs/ls1043ardb.h
 F:	configs/ls1043ardb_defconfig
 F:	configs/ls1043ardb_nand_defconfig
diff --git a/board/keymile/secu1/MAINTAINERS b/board/keymile/secu1/MAINTAINERS
index 8df25f8..e441f25 100644
--- a/board/keymile/secu1/MAINTAINERS
+++ b/board/keymile/secu1/MAINTAINERS
@@ -1,6 +1,7 @@
 Hitachi Power Grids SECU1 BOARD
 M:	Holger Brunck <holger.brunck@hitachienergy.com>
 S:	Maintained
+F:	board/keymile/secu1/
 F:	board/keymile/common/
 F:	board/keymile/scripts/
 F:	include/configs/socfpga_arria5_secu1.h
diff --git a/board/softing/vining_fpga/MAINTAINERS b/board/softing/vining_fpga/MAINTAINERS
index c2002fe..ed44b09 100644
--- a/board/softing/vining_fpga/MAINTAINERS
+++ b/board/softing/vining_fpga/MAINTAINERS
@@ -1,5 +1,6 @@
 VINING FPGA BOARD
 M:	Marek Vasut <marex@denx.de>
 S:	Maintained
+F:	board/softing/vining_fpga/
 F:	include/configs/socfpga_vining_fpga.h
 F:	configs/socfpga_vining_fpga_defconfig
diff --git a/board/terasic/de0-nano-soc/MAINTAINERS b/board/terasic/de0-nano-soc/MAINTAINERS
index 7f4cf1e..6ffa0c0 100644
--- a/board/terasic/de0-nano-soc/MAINTAINERS
+++ b/board/terasic/de0-nano-soc/MAINTAINERS
@@ -1,5 +1,6 @@
 SOCFPGA ATLAS BOARD
 M:	Dinh Nguyen <dinguyen@kernel.org>
 S:	Maintained
+F:	board/terasic/de0-nano-soc/
 F:	include/configs/socfpga_de0_nano_soc.h
 F:	configs/socfpga_de0_nano_soc_defconfig
diff --git a/board/terasic/de1-soc/MAINTAINERS b/board/terasic/de1-soc/MAINTAINERS
index bd7a8d5..1e726e9 100644
--- a/board/terasic/de1-soc/MAINTAINERS
+++ b/board/terasic/de1-soc/MAINTAINERS
@@ -1,5 +1,6 @@
 DE1-SoC BOARD
 M:	Anatolij Gustschin <agust@denx.de>
 S:	Maintained
+F:	board/terasic/de1-soc/
 F:	include/configs/socfpga_de1_soc.h
 F:	configs/socfpga_de1_soc_defconfig
diff --git a/board/terasic/de10-nano/MAINTAINERS b/board/terasic/de10-nano/MAINTAINERS
index f4dd0df..ebfd3b2 100644
--- a/board/terasic/de10-nano/MAINTAINERS
+++ b/board/terasic/de10-nano/MAINTAINERS
@@ -1,5 +1,6 @@
 DE10-NANO BOARD
 M:	Dalon Westergreen <dwesterg@gmail.com>
 S:	Maintained
+F:	board/terasic/de10-nano/
 F:	include/configs/socfpga_de10_nano.h
 F:	configs/socfpga_de10_nano_defconfig
diff --git a/board/terasic/de10-standard/MAINTAINERS b/board/terasic/de10-standard/MAINTAINERS
index 94bf1e0..49fdc75 100644
--- a/board/terasic/de10-standard/MAINTAINERS
+++ b/board/terasic/de10-standard/MAINTAINERS
@@ -1,5 +1,6 @@
 DE10-STANDARD BOARD
 M:	Humberto Naves <hsnaves@gmail.com>
 S:	Maintained
+F:	board/terasic/de10-standard/
 F:	include/configs/socfpga_de10_standard.h
 F:	configs/socfpga_de10_standard_defconfig
diff --git a/board/terasic/sockit/MAINTAINERS b/board/terasic/sockit/MAINTAINERS
index 792f184..e301751 100644
--- a/board/terasic/sockit/MAINTAINERS
+++ b/board/terasic/sockit/MAINTAINERS
@@ -1,5 +1,6 @@
 SOCKIT BOARD
 M:	Marek Vasut <marex@denx.de>
 S:	Maintained
+F:	board/terasic/sockit/
 F:	include/configs/socfpga_sockit.h
 F:	configs/socfpga_sockit_defconfig